From bd025e2bdbaf86425b1d692ffc4aa87c3c086cc7 Mon Sep 17 00:00:00 2001 From: peterbell10 Date: Sun, 25 Jun 2017 10:07:16 +0100 Subject: Fix cBlockArea assertion and mis-indexing (#3810) --- src/BlockArea.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/BlockArea.cpp b/src/BlockArea.cpp index 53d82a106..cec113936 100644 --- a/src/BlockArea.cpp +++ b/src/BlockArea.cpp @@ -507,7 +507,7 @@ bool cBlockArea::Read(cForEachChunkProvider & a_ForEachChunkProvider, int a_MinB ASSERT(cChunkDef::IsValidHeight(a_MinBlockY)); ASSERT(cChunkDef::IsValidHeight(a_MaxBlockY)); ASSERT(a_MinBlockX <= a_MaxBlockX); - ASSERT(a_MinBlockY <= a_MaxBlockX); + ASSERT(a_MinBlockY <= a_MaxBlockY); ASSERT(a_MinBlockZ <= a_MaxBlockZ); // Include the Max coords: @@ -3020,7 +3020,7 @@ void cBlockArea::cChunkReader::BlockEntity(cBlockEntity * a_BlockEntity) auto areaX = a_BlockEntity->GetPosX() - m_Area.m_Origin.x; auto areaY = a_BlockEntity->GetPosY() - m_Area.m_Origin.y; auto areaZ = a_BlockEntity->GetPosZ() - m_Area.m_Origin.z; - int Idx = cChunkDef::MakeIndex(areaX, areaY, areaZ); + int Idx = m_Area.MakeIndex(areaX, areaY, areaZ); m_Area.m_BlockEntities->insert({Idx, a_BlockEntity->Clone(areaX, areaY, areaZ)}); } -- cgit v1.2.3